From 1b9e624004cfb64135b744f877e5fa87e5810abd Mon Sep 17 00:00:00 2001 From: Sebastien Castiel Date: Tue, 9 Jan 2024 08:53:51 -0500 Subject: Ask the user who they are when opening a group for the first time (#7) --- .../[groupId]/expenses/active-user-modal.tsx | 134 +++++++++++++++++++++ src/app/groups/[groupId]/expenses/expense-list.tsx | 14 ++- src/app/groups/[groupId]/expenses/page.tsx | 80 ++++++------ 3 files changed, 187 insertions(+), 41 deletions(-) create mode 100644 src/app/groups/[groupId]/expenses/active-user-modal.tsx (limited to 'src/app/groups/[groupId]/expenses') diff --git a/src/app/groups/[groupId]/expenses/active-user-modal.tsx b/src/app/groups/[groupId]/expenses/active-user-modal.tsx new file mode 100644 index 0000000..5d9d005 --- /dev/null +++ b/src/app/groups/[groupId]/expenses/active-user-modal.tsx @@ -0,0 +1,134 @@ +'use client' + +import { Button } from '@/components/ui/button' +import { + Dialog, + DialogContent, + DialogDescription, + DialogFooter, + DialogHeader, + DialogTitle, +} from '@/components/ui/dialog' +import { + Drawer, + DrawerContent, + DrawerDescription, + DrawerFooter, + DrawerHeader, + DrawerTitle, +} from '@/components/ui/drawer' +import { Label } from '@/components/ui/label' +import { RadioGroup, RadioGroupItem } from '@/components/ui/radio-group' +import { getGroup } from '@/lib/api' +import { useMediaQuery } from '@/lib/hooks' +import { cn } from '@/lib/utils' +import { ComponentProps, useEffect, useState } from 'react' + +type Props = { + group: NonNullable>> +} + +export function ActiveUserModal({ group }: Props) { + const [open, setOpen] = useState(false) + const isDesktop = useMediaQuery('(min-width: 768px)') + + useEffect(() => { + const tempUser = localStorage.getItem(`newGroup-activeUser`) + const activeUser = localStorage.getItem(`${group.id}-activeUser`) + if (!tempUser && !activeUser) { + setOpen(true) + } + }, [group]) + + function updateOpen(open: boolean) { + if (!open && !localStorage.getItem(`${group.id}-activeUser`)) { + localStorage.setItem(`${group.id}-activeUser`, 'None') + } + setOpen(open) + } + + if (isDesktop) { + return ( + + + + Who are you? + + Tell us which participant you are to let us customize how the + information is displayed. + + + setOpen(false)} /> + +

+ This setting can be changed later in the group settings. +

+
+
+
+ ) + } + + return ( + + + + Who are you? + + Tell us which participant you are to let us customize how the + information is displayed. + + + setOpen(false)} + /> + +

+ This setting can be changed later in the group settings. +

+
+
+
+ ) +} + +function ActiveUserForm({ + group, + close, + className, +}: ComponentProps<'form'> & { group: Props['group']; close: () => void }) { + const [selected, setSelected] = useState('None') + + return ( +
{ + event.preventDefault() + localStorage.setItem(`${group.id}-activeUser`, selected) + close() + }} + > + +
+
+ + +
+ {group.participants.map((participant) => ( +
+ + +
+ ))} +
+
+ +
+ ) +} diff --git a/src/app/groups/[groupId]/expenses/expense-list.tsx b/src/app/groups/[groupId]/expenses/expense-list.tsx index ef4903c..4578300 100644 --- a/src/app/groups/[groupId]/expenses/expense-list.tsx +++ b/src/app/groups/[groupId]/expenses/expense-list.tsx @@ -27,11 +27,15 @@ export function ExpenseList({ if (activeUser || newUser) { localStorage.removeItem('newGroup-activeUser') localStorage.removeItem(`${groupId}-newUser`) - const userId = participants.find( - (p) => p.name === (activeUser || newUser), - )?.id - if (userId) { - localStorage.setItem(`${groupId}-activeUser`, userId) + if (activeUser === 'None') { + localStorage.setItem(`${groupId}-activeUser`, 'None') + } else { + const userId = participants.find( + (p) => p.name === (activeUser || newUser), + )?.id + if (userId) { + localStorage.setItem(`${groupId}-activeUser`, userId) + } } } }, [groupId, participants]) diff --git a/src/app/groups/[groupId]/expenses/page.tsx b/src/app/groups/[groupId]/expenses/page.tsx index 5285cb8..2a1ac5f 100644 --- a/src/app/groups/[groupId]/expenses/page.tsx +++ b/src/app/groups/[groupId]/expenses/page.tsx @@ -1,3 +1,4 @@ +import { ActiveUserModal } from '@/app/groups/[groupId]/expenses/active-user-modal' import { ExpenseList } from '@/app/groups/[groupId]/expenses/expense-list' import { Button } from '@/components/ui/button' import { @@ -24,45 +25,52 @@ export default async function GroupExpensesPage({ }: { params: { groupId: string } }) { + const group = await getGroup(groupId) + if (!group) notFound() + return ( - -
- - Expenses - - Here are the expenses that you created for your group. - - - - - -
+ <> + +
+ + Expenses + + Here are the expenses that you created for your group. + + + + + +
- - ( -
-
- - + + ( +
+
+ + +
+
+ +
-
- -
-
- ))} - > - - - - + ))} + > + + + + + + + ) } -- cgit v1.3